tools: Avoid -nostdlib argument to $(LD).

This interacts badly with GNU ld on Solaris.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 739a1705586337fb627091684b611bd9e346c759..6b6c63411ed66c3d9f50dcbf4f2b7b7511b1186f 100644 (file)
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -41,7 +41,7 @@ all: hvmloader
 
 hvmloader: roms.h acpi/acpi.a $(SRCS)
        $(CC) $(CFLAGS) -c $(SRCS)
-       $(LD) $(LDFLAGS_DIRECT) -nostdlib -N -Ttext $(LOADADDR) -o hvmloader.tmp $(OBJS) acpi/acpi.a
+       $(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o hvmloader.tmp $(OBJS) acpi/acpi.a
        $(OBJCOPY) hvmloader.tmp hvmloader
        rm -f hvmloader.tmp
 

diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile
index 3bb1998a82c14d21a6be277187aacbf1b2dc5c47..b00224ae8a9b0c30874e2c1c56b648cce4390604 100644 (file)
--- a/tools/firmware/vmxassist/Makefile
+++ b/tools/firmware/vmxassist/Makefile
@@ -46,7 +46,7 @@ all: vmxassist.bin
 
 vmxassist.bin: vmxassist.ld $(OBJECTS)
        $(CPP) $(DEFINES) vmxassist.ld > vmxassist.tmp
-       $(LD) -o vmxassist $(LDFLAGS_DIRECT) -nostdlib --fatal-warnings -N -T vmxassist.tmp $(OBJECTS)
+       $(LD) -o vmxassist $(LDFLAGS_DIRECT) --fatal-warnings -N -T vmxassist.tmp $(OBJECTS)
        nm -n vmxassist > vmxassist.sym
        $(OBJCOPY) -p -O binary -R .note -R .comment -R .bss -S --gap-fill=0 vmxassist vmxassist.tmp
        dd if=vmxassist.tmp of=vmxassist.bin ibs=512 conv=sync

diff --git a/tools/tests/blowfish.mk b/tools/tests/blowfish.mk
index 95c39ae4ab9f69bb9846ba81532b2b722de65671..ecad7836a47f01cbb55794d82edb889e9ef9c7b0 100644 (file)
--- a/tools/tests/blowfish.mk
+++ b/tools/tests/blowfish.mk
@@ -10,13 +10,12 @@ CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector,)
 CFLAGS  += $(call cc-option,$(CC),-fno-stack-protector-all,)
 
 CFLAGS  += -fno-builtin -O2 -msoft-float
-LDFLAGS  = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0x100000
 
 .PHONY: all
 all: blowfish.bin
 
 blowfish.bin: blowfish.c
        $(CC) $(CFLAGS) -c blowfish.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -o blowfish.tmp blowfish.o
+       $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0x100000 -o blowfish.tmp blowfish.o
        $(OBJCOPY) -O binary blowfish.tmp blowfish.bin
        rm -f blowfish.tmp